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

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



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