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

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

Change-Id: Iac4ab79f1cf649eb3a861fd46bf63b9dc6c9ef61