Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e am: f3c3fcee am: b378c1a3 am: c2a4ca2d am: aa0f59a7 Change-Id: I370333f3687473d8e825d44c9ec8eb77280e5a4b