Merge "Update MediaRouter2Manager api" into rvc-dev am: 672fe2aeb3

Change-Id: I130c84522dc8532e4634132af776a0786c6344e7