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

Merge changes from topic "am-ca452b821cef40519e207fafd9572781" into tm-d1-dev-plus-aosp am: c140cbbf am: ca5b6e9b

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



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