Merge "Fix build error" into main am: ef5fb8e98c am: c199939a74

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

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