Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced am: 71012d52

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

Change-Id: I8abc0cc6e4a3c38b48288282ccdc4dfdd0f96858