Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into...

Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp am: 6dd732df

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



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