Merge "Reland "Remove std::char_traits for non-standard types"" into main am: f5d9b62fb0

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

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