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

Merge changes from topic "am-a9d919ad67104688b986d7a15b032cb5" into tm-qpr-dev-plus-aosp am: 65423055

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



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