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

Change-Id: Ia7bc4616a9056a2713f296beef8a851ad7f7d2a5