Merge "Fix warning about missing terminating ' character" into main am: 3a0a27af82 am: 3747b573eb am: 95cf533fed am: 74386870d3 am: ef03242b21

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

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