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

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

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



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