am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev

* commit '0c58229306f30e26d4b0ddb3d332def9b7382480':
  Revert "Use AlertDialog for MediaRouteControllerDialog"