Merge "Fix build error" into main am: 9865dc2801 am: 3e0ea9b2a9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3163978

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