[automerger skipped] Merge "Fixed errors after updated aosp/3261955" into main...

[automerger skipped] Merge "Fixed errors after updated aosp/3261955" into main am: 18ef8ba3 am: d4b3a71f -s ours

am skip reason: Merged-In I69beecd0ae7c0b993da4812a663ae95077dff749 with SHA-1 f39dfee1 is already in history

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



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