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

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

Change-Id: I0269a40f6984fa61522b0fb48aa1a66f1906683b