Merge changes from topic "am-1feffb280b5742faa39e6dbb1cd44aa8" into main am: 87a23065 -s ours

am skip reason: Merged-In I2f08fb2fba667afa34f9951ff193bcb9d12683a6 with SHA-1 443980d0 is already in history

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



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