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

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

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