Merge "autogenerated reformatting by bpfmt" am: 028182d9 am: a9c64704 am:...

Merge "autogenerated reformatting by bpfmt" am: 028182d9 am: a9c64704 am: 30f729ed am: 2d3f029a

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



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