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

Change-Id: I71db9a3f35c6d02f77821a0bc85b19e5e18735a5