[automerger skipped] Merge "DO NOT MERGE Reorder include to remove merge...

[automerger skipped] Merge "DO NOT MERGE Reorder include to remove merge conflict" am: fa921231 -s ours am: df78fbf5 am: 21290880 am: dfdb9a77 am: 0b268406 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5d1119d4ec6dcd3c821c5c4c5693a1a5a5e2e8de