[automerger skipped] Merge changes I3ed91373,Ie3f2e194 into main am: 272d3ffb -s ours

am skip reason: Merged-In I4846fd8c0a3f2a49349a5ebb08f2f6fa8dbdb621 with SHA-1 e3a1db43 is already in history

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



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