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

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

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