Merge changes from topic "am-7a1f03e3af654a0b88118a1af946d0bd" into main am: 1bef3a67 -s ours

am skip reason: Merged-In Idd019e3735859cdf80a77c0f547984fa9a8e6197 with SHA-1 632450f3 is already in history

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



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