Merge "Fix build on ToT Clang" into main am: 86e7e6be0e

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

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