Merge "repo_pull: Disable bare-except warning" am: 9520c3f968 am: 39c1b841a1

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

Change-Id: Ib46c0efe1ea8bb160d9ceb7c45d622596fe82f79