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

Change-Id: I46ca2a91a1f3bf75804adc388c5ef7ab4c46012c