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

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

Change-Id: Icec3a091b1e7ea5385813e3c5a3c1699610a0188