[automerger skipped] Merge Android U (ab/10368041) am: d1c3c5f719 -s ours am: ed47136a67 -s ours

am skip reason: Merged-In I4ba4f2c7c3c20f2cad6f5879d54bbcec19fa27d1 with SHA-1 f0f3731891 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcxx/+/24182427

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