[automerger skipped] DO NOT MERGE - Skip TP1A.220624.013 am: af700206b2 -s ours

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

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

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