Merge cherrypicks of [19037861] into tm-release. am: d387ee3a27

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

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