Merge "auto formatting from bpfmt" am: d836dd4440

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

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