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

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

Change-Id: I8cec6ac512c44de0d3815980c5c07931f3e628bb