Merge changes from topic "am-0cd96541d1df433aa278a1ed9be3197b" into tm-d1-dev-plus-aosp am: 1bcd4304 -s ours

am skip reason: Merged-In I02190be62855f5f3b86c41677bbf7ff6a362e652 with SHA-1 1d470caa is already in history

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



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