Merge "PREUPLOAD bpfmt" am: 08a30ad232

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1890998

Change-Id: Ib05daf1855f8a1c637da4cd58b54cd791bb30a55