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

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

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