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

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

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