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

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

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

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



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