Merge "Move AlertDialog to SYSTEM_ALERT" into oc-dr1-dev
am: bc66fa2f91

Change-Id: I4a021f164c2b4ffb834c50e6e072fd62094adc20