Merge changes from topic "am-7304460109c44279b5854a8caa06c38c" into...

Merge changes from topic "am-7304460109c44279b5854a8caa06c38c" into tm-d1-dev-plus-aosp am: ac58e115 am: 5107a6d0

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



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