am 96c23baf: am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev

* commit '96c23baff06d3a50995b510767f2a24882d64005':
  Use AlertDialog for MediaRouteControllerDialog