Merge changes from topic "am-23444252224b42a6aecd5ec178f79b45" into...

Merge changes from topic "am-23444252224b42a6aecd5ec178f79b45" into tm-qpr-dev-plus-aosp am: 73c00a78

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



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