Merge "repo_pull: Fix ungrouped-imports warnings" am: 80e39b9d5c

Original change: https://android-review.googlesource.com/c/platform/development/+/1363357

Change-Id: I8f240f59d86a294ce56d4f7fe96ace453f18c170