Merge "Fix unicode in documentation generated from this code" into main am:...

Merge "Fix unicode in documentation generated from this code" into main am: 82470eb3 am: f3f5ee25

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2698434



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