Merge "Add a missing include for char16_t" am: 04d05a69c3

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

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