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

Change-Id: I610b32756a2b26e5015b508da76bd348cd3fbd8c