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

Android 7.1.2 Release 17 (NJH47B)

Change-Id: I46374a6253e5f20da5ea9de3d3d2e2353ed12942
9 files changed