Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced63 am: 240637a450

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

Change-Id: I7e43221ec2e259b76a28a49a425eb2a5dbcb7bf9