Merge "auto formatting from bpfmt" am: d836dd4440 am: d1a2b88b2e

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

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