[automerger skipped] Merge "Fix transfer API." into rvc-qpr-dev am: 92d9af6c47 am: 577539c9a0 -s ours

am skip reason: Change-Id I8511d4357788e70f83bcbd366908b42a691afbcb with SHA-1 4925e3a220 is in history

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

Change-Id: I811acb834d76fa1291337d2103f83a1582d28421