[automerger skipped] Merge changes I4fdfbe80,Ie2bb56c5,I6ee0e839 into...

[automerger skipped] Merge changes I4fdfbe80,Ie2bb56c5,I6ee0e839 into tm-qpr-dev am: f0216079 am: d9ce959b -s ours am: 6f2a456d -s ours

am skip reason: Merged-In I4fdfbe80ea0c368a4809e5613e5f9c3a8369e2a3 with SHA-1 4fb8913b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21676116



Change-Id: I02afca72ec4cb419c67990cd9d7ed37c83d3e3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>