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

Android 7.1.2 Release 5 (N2G47J)

Change-Id: Iba1f7459718f980c71acc673fd263ed82c740f24
1137 files changed