Merge "Move AlertDialog to SYSTEM_ALERT"
am: bcdd60d4db

Change-Id: Ifec83989ad784c7842403c4ae394731d51b267ad