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

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

Change-Id: Iacc3bffe2b560f841b3ef223f2b6e5c2e05d6f2b