Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156" into tm-qpr-dev

* changes:
  Add mediaroutertest to frameworks/base/media/TEST_MAPPING
  Rethrow MediaRouter2Manager RemoteExceptions
  Guard MediaDeviceManager.Entry against successive stop calls