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: 240637a4 am: 551ba9a4

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

Change-Id: Iddfea31daf4d194b0a347ff3e0156723c06e9a16