Merge "PREUPLOAD += bpfmt" into main am: 48028b6d9c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3114280

Change-Id: I342e03b1e9819e9dfa1b9c2827fd440f5b2fa0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>