Merge "bpfmt -w." into main am: d8c4c01f am: ded8b392 am: 34ec5962

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2901474



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