Merge "Merge "MediaRouter: Defer releasing routing controller when transfer"...

Merge "Merge "MediaRouter: Defer releasing routing controller when transfer" into rvc-dev am: 82ff3f14 am: 31353b7e am: c6b3963a" into rvc-qpr-dev-plus-aosp am: 5e45f13d

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

Change-Id: Iff7ddf30ce35f2a315616f3fb11aab6088d4d28b