Merge changes from topic "am-8c95ba0ec8fc4c8397b83d6b1095613a" into main am: 4b2a1bd7 -s ours

am skip reason: Merged-In I95c5f29ecc3af5d3ab0b66f168eef9531f9e0aaa with SHA-1 343928da is already in history

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



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