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

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

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