Merge "autogenerated reformatting by bpfmt" am: 028182d974 am: a9c64704c7

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

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