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

Change-Id: I069a8c3380f87f951fd0116ef28a8454a08ac9fd