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

Change-Id: I370333f3687473d8e825d44c9ec8eb77280e5a4b