Merge "Make BackupTransport more resilient" into tm-dev am: a3a65735 am: a63b81a3 am: 14b05624 am: c3a7ee6f

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



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