Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e am: f3c3fcee am: 1eedbaad am: d4a54ffb Change-Id: I9eb1b29047202fc640055fa43dd9370b8a16cb5e