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

Change-Id: I2604c2ebe02f61b260b87adac4473c198fc09457