Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into...

Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp am: 800c23ab

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



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