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

Change-Id: I78165c2beb9730f4ec615d5955bca3c1f014d0a8