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

Android 7.1.1 release 4

Change-Id: I6b4a4167cb096b2c9835d4af5f0c6802b28d3dc6
1709 files changed