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

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

Change-Id: I3a4d573b27d562c177e98236f3785613c235e5a5