Merge "repo_pull: Add missing import" am: 02006e0199 am: 129197815d am: b88712f60f

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

Change-Id: I1996aa7167dd7b93029dd934d212ef92fcb382c4