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

Merge changes from topic "am-e65585e4385447fca4f3702b7d2fbbe3" into tm-qpr-dev-plus-aosp am: a8070213

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



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