Merge changes from topic "am-63e0065ed2e145c5997006d1209374f9" into...

Merge changes from topic "am-63e0065ed2e145c5997006d1209374f9" into tm-d1-dev-plus-aosp am: 5207d07b

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



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