Merge changes from topic "am-4d01586376f049448a8135ed5eb2c26e" into...

Merge changes from topic "am-4d01586376f049448a8135ed5eb2c26e" into tm-qpr-dev-plus-aosp am: 0db3bf8e -s ours

am skip reason: Merged-In Id0ceba345942baf21177f687b8dd85ef001c0a9e with SHA-1 8c8d1c0d is already in history

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



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