Merge "typo: remove semicolon in a wrong position" am: 257db3c143 am: 2529b3ab30 am: aefd890c31 am: e45a015aa8

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

Change-Id: I926a6278814843e6d57e7debd5b3fab3f80ace66