Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e am: c27bc21c am: 674b32f0 am: 460baaf1 Change-Id: I2e849b4e179185fbe431907b8eaa8a792873a785