Merge "Move AlertDialog to SYSTEM_ALERT" am: bcdd60d4db am: 153b1e82d8 am: 57e5447e30  -s ours
am: d6004511a3  -s ours

Change-Id: I15e69d4a2088d21d402c58191d736f9f885c0195