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: I07ee21e7fb0e533b4924e438b5069998fec3b450