Merge "typo: remove semicolon in a wrong position" am: 257db3c1 am:...

Merge "typo: remove semicolon in a wrong position" am: 257db3c1 am: 2529b3ab am: aefd890c am: e45a015a

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

Change-Id: I926a6278814843e6d57e7debd5b3fab3f80ace66