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