Merge "Fix formatting." into main am: 92db70b6 am: 9039cb87 am: cbb641a9...

Merge "Fix formatting." into main am: 92db70b6 am: 9039cb87 am: cbb641a9 am: 809ad417 am: a9084862

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



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