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

Change-Id: I9eb1b29047202fc640055fa43dd9370b8a16cb5e