Merge "Fix build error" into main am: ef5fb8e98c

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

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