Merge "Add MediaRouter2#stop" into rvc-dev am: dae3eea890 am: 569e7c8152

Change-Id: Ibf8d5e030bbdd6ef4c478365c95b6dcbcb140f51