[automerger skipped] Merge changes I2cc194ad,I1ed99b7f,I404a307a into...

[automerger skipped] Merge changes I2cc194ad,I1ed99b7f,I404a307a into tm-qpr-dev am: 63db155f am: ea51de51 -s ours

am skip reason: Merged-In I2cc194ad604953933fb14c52cecb6151a7deee11 with SHA-1 e0cd5a8a is already in history

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



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