Merge "repo_pull: Disable bare-except warning" am: 9520c3f968 am: 39c1b841a1 am: 6b7175ebba am: 5a206f0ecb

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

Change-Id: I488721e2ec39417b09cde41bbd566c9eda22e98f