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

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

Change-Id: I70f548abe7da26eca12bf32b5bd1db652077b983