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

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

Change-Id: Ib5f44168e8484280a06f708c7499ea1916fa9558