Backport https://reviews.llvm.org/D69983. am: 847f383168 am: 87627e9848

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

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