Merge tag 'android-7.1.1_r22' of https://android.googlesource.com/platform//frameworks/base into HEAD

Android 7.1.1 Release 22 (NMF26X)

Change-Id: I6b4374b70fe4c3569c427e39f48872782da87e43
22 files changed