Merge "Fix AlertDialog ignoring the provided theme" into nyc-dev
am: 53fb1392f4

* commit '53fb1392f46ecd2e119c6e73e5ec8220927f450a':
  Fix AlertDialog ignoring the provided theme

Change-Id: Ie6989f0ba9530bea69a2a0543a902e8c6c681846