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

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

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