Merge "Fix transfer API." into rvc-qpr-dev am: 92d9af6c47

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

Change-Id: I9cc0cc4e7856f22f6917a2e22b6d40a3494142df