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

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

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

Change-Id: I606dc3daf38dbe160139c1ba6abbffa4ce2d95b8