[automerger skipped] Merge changes from topic "cherrypicker-L13500000963621094:N14000001415635321" into main am: bfc1c042 am: c8ca6920 -s ours am: f4d38451 -s ours

am skip reason: Merged-In I94f5a9a4313c13375062fdade0e672d51eb5dc55 with SHA-1 99396a46 is already in history

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



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