Merge tag 'android-7.1.1_r22' into aosp-7.1.1

Android 7.1.1 Release 22 (NMF26X)

Conflicts:
	src/com/android/contacts/common/util/AccountSelectionUtil.java
tree: 86933aafeafaa453059f75dcd95305da5b2e4a77
  1. assets/
  2. icons/
  3. res/
  4. src/
  5. TestCommon/
  6. tests/
  7. AndroidManifest.xml
  8. build.gradle