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

Android 7.1.1 Release 14 (N4F26O)