Merge "Fix build with ToT libc++" into main am: dbecfa8c6e am: a99e1cd67b

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

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