Merge "Fix formatting." into main am: 92db70b618 am: 9039cb8779 am: cbb641a9ad

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

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