am 7ec20820: Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev

* commit '7ec208209a211271dd37b6749d8a93d963150a69':
  MediaRouter: Remove uses of not-yet-public API