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

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

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