[automerger skipped] DO NOT MERGE - Merge Android 13 am: 84d309aa8d -s ours

am skip reason: Merged-In I230be7dd8d657679c2b33c6324f3b525a98d1e2d with SHA-1 b27c78260b is already in history

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

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