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

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

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