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

Change-Id: If58332030fe8e7b86db775c6fdcd06b31a46cc36