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

Android 7.1.2 Release 17 (NJH47B)

Change-Id: I2dc0c9974d45ed9e947ac3ff94b5aa6d5140eee9
2 files changed