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

Change-Id: I0d140a28aa7f2475555583ba0795214eb272d84a