Merge "Fixed errors after updated aosp/3261955" into main am: 18ef8ba332

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

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