Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev