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

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

Change-Id: I93f9c1dd49650e9833f8557cdb31bd62ad35beb2