Merge changes from topic "am-26121764726043048ee87019503248ca" into main am: 961587f1 -s ours

am skip reason: Merged-In I5f207ddd09fab8c269db03d9a6dc09fb1d4cce92 with SHA-1 6a434c0a is already in history

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



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