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

Android 7.1.1 release 4

Change-Id: I57685d2ec9c7d33a6f977441e45d027512bce7ba
641 files changed