Merge "remove extra semicolons [-Wextra-semi]" am: b0379e376d am: 9baa2fe651

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

Change-Id: I4de1657e4b47a9b341df8a83721c0205f76c11fe