Merge "MediaRouter: Defer releasing routing controller when transfer" into rvc-dev am: 82ff3f1472

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

Change-Id: I34aba44e872645e8b5d53ddb8dfa0a5e61fd76db