Merge "Clean up MediaRouter2Manager" into rvc-dev am: 8a028947c3 am: da4dfb8d02

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

Change-Id: I55029400486088ab445054ed58f44fc6f93f3a79