Merge changes from topic "am-e0fac6ee9d214df680c6516582ea20a3" into...

Merge changes from topic "am-e0fac6ee9d214df680c6516582ea20a3" into tm-qpr-dev-plus-aosp am: ca83a168

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



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