Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into...

Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into tm-qpr-dev-plus-aosp am: 674108da

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



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