Merge "clang-format: Add IncludeBlocks: Preserve" am: 2408570981 am: 839e56672e

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

Change-Id: Ic8e583be9816406e255cbcfb8f29b59a079e09e8