Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into...

Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp am: a06f1eba

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



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