Merge "Add a missing include for char16_t" am: 04d05a69 am: ac03b6e0 am:...

Merge "Add a missing include for char16_t" am: 04d05a69 am: ac03b6e0 am: 46104b6f am: 7f247aba

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2470281



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