Merge changes from topic "am-0222635705cd4449a442146f5b96e48e" into...

Merge changes from topic "am-0222635705cd4449a442146f5b96e48e" into tm-qpr-dev-plus-aosp am: e23a43e1

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



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