Merge "Make BackupTransport more resilient" into tm-dev am: a3a65735 am: 3579acc6 am: 395cb87b

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



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