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

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

Change-Id: I7ca4b77bd0f84fbcad970baa1ae469c7c954ac6a