Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321"...

Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321" into main am: bfc1c042

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



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