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