am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev

* commit 'e94f5f556f5a46cf6745ae642d245ca712e1f254':
  Revert "Use AlertDialog for MediaRouteControllerDialog"