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

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

Change-Id: Ia65481ed0f864796b61f34086e98246b9b7af380