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
diff --git a/.clang-format b/.clang-format
index 03af56d..6725a1f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -11,3 +11,4 @@
 IndentWidth: 4
 PenaltyBreakBeforeFirstCallParameter: 100000
 SpacesBeforeTrailingComments: 1
+IncludeBlocks: Preserve