[automerger skipped] Merge changes I4f225864,Ic95b7014 into tm-qpr-dev am:...

[automerger skipped] Merge changes I4f225864,Ic95b7014 into tm-qpr-dev am: 18bd9509 am: dfd02014 -s ours

am skip reason: Merged-In I4f2258648fa681a2763c41e05bacbb83430f6c09 with SHA-1 90ed1d58 is already in history

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



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