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

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