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

Change-Id: I55bae22b52c784772826f864580dffbfe02c67f0