Merge "Remove std::char_traits for non-standard types" into main am: 73f5809501

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

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