Merge "Merge "MediaRouter: Defer releasing routing controller when transfer" into rvc-dev am: 82ff3f14 am: 31353b7e am: 2ba93828" into rvc-qpr-dev-plus-aosp am: 000b1fb6

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

Change-Id: I8dde7eef9311348ec23b1fd2cb2f89aa31af5793