Merge "Control behavior of unified restore pipeline after transport failure...

Merge "Control behavior of unified restore pipeline after transport failure during K/V restore with flag" into udc-dev am: f5f12930 am: 6186d732

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



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