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

Android 7.1.2 Release 5 (N2G47J)

Change-Id: Ic529555cf8af882475f0b976ef6f62cc14c8f798
74 files changed