Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e16 am: f3c3fcee07

Change-Id: Ie754017461aaa664f4fc9ca33159c9373b23b499