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

Merge changes from topic "am-a9e26c3082994f7bbaad0b98192988d9" into tm-qpr-dev-plus-aosp am: fcd94d22

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



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