Merge "Move AlertDialog to SYSTEM_ALERT" am: bcdd60d4db
am: 153b1e82d8

Change-Id: Ia8d5f7582e1e912c43345f086476117a0f90a109