am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev

* commit 'd40a4d74c623175c96a2e9d865a99826e56d1132':
  Add media router service and integrate with remote displays.