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

Android 7.1.1 release 28

Change-Id: I6d9b87d358bf228844f22f0cb62eee6edc58f8e5
19 files changed