Merge changes from topic "am-457df0b48ac8445ea4964268f35b9c82" into main am: c9c97bec -s ours

am skip reason: Merged-In I2534d6a2fc388b582b2d0f13aa8640b477606fce with SHA-1 2f6f51be is already in history

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



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