Backport https://reviews.llvm.org/D69983. am: 847f383168 am: 87627e9848 am: cc3cfc848e am: cbd12ac1ef am: 90f6213b7d

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

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