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

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

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