Merge "Fix some style issues" am: 1b87c970c8 am: 9a155b957a am: 9006230a7e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313803

Change-Id: Icb9d23577931b48460be696a2b484bbcc48cf7c5