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

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

Change-Id: Ic2dfd8cce92a026d1ccde56bf4a4f49abdb614d2