Merge "PREUPLOAD bpfmt" am: 08a30ad232 am: 0fd942f3a6 am: 6b012a0974

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

Change-Id: I2c1d4f63535b7724e539849eb68dbbabe3e3ea63