Merge "Fix build with ToT libc++" into main am: 12a553637f

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

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