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

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

Change-Id: Id7f2e98c158488467027040f31e6113cd26c8e5c