Merge changes from topic "am-1e706538e76e4636ac7a37fc4271fd9d" into...

Merge changes from topic "am-1e706538e76e4636ac7a37fc4271fd9d" into tm-qpr-dev-plus-aosp am: 49907258 -s ours

am skip reason: Merged-In Iceb33606da3a49b9638ab21aeae17a168c1b411a with SHA-1 902f020b is already in history

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



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