[automerger skipped] Merge "Handle CancellationException in...

[automerger skipped] Merge "Handle CancellationException in BackupTransportClient" into tm-dev am: 22f211ca am: 13f84fc0 am: a8d34303 -s ours

am skip reason: Merged-In Ibee991dbc9673c7b6b4d0051f09b4e8862ad6af4 with SHA-1 d0c42dc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567822



Change-Id: I72bd979f46cf3bfd80d1b4a16b362c9f9498a0f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>