Merge "native window auto-format" am: dc44a31e26 am: b88716eae0

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

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