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

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

Change-Id: Id7ce3af8f97d450b5b9dc41a7bb544f90cd1ded0