Merge "Revert "DO NOT MERGE) MediaRouter: Let SystemMRP use a new framework API of v24"" into mnc-ub-dev am: b36bddf9e5
am: 20c24b664e  -s ours

* commit '20c24b664e24247f41e6bf608b73f91477cf9ce0':
  Revert "DO NOT MERGE) MediaRouter: Let SystemMRP use a new framework API of v24"