Merge "Fix some style issues" am: 1b87c970c8

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

Change-Id: I795b0f7f7f3c3f6b57a57c35c66f1e913a5db823