Merge "Merge "Fix AlertDialog ignoring the provided theme" into nyc-dev am: 53fb1392f4 am: 98c8687f3b" into nyc-mr1-dev-plus-aosp
am: 3ddfc4659f

* commit '3ddfc4659f264923df5cf1c247d805dac659ff49':

Change-Id: I3cc643fb7998eeb56b4f0012d49c9f3fc4dc10d2