Merge "Enforce formatting of bp files on repo upload" am: 8a8b0e9525 am: 58554cc6c7 am: de8564427b

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

Change-Id: I0594c1f748a48859c26875c58840c329309ff83d