Merge "[Media TTT] Re-enable media transfer for QPR3." into tm-qpr-dev am: 402fd626

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



Change-Id: I5b6e92243803c5a3cdc21d1007d76c9c976f54e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>