Merge changes from topic "am-002b3aa45a4f48d7bab006cc4c2cdf54" into...

Merge changes from topic "am-002b3aa45a4f48d7bab006cc4c2cdf54" into tm-qpr-dev-plus-aosp am: 310dedbd

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



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