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

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

Change-Id: I97a825a488b3663e7599cd8a9659c14d04856a0b