Merge "Move AlertDialog to SYSTEM_ALERT" into oc-dr1-dev am: bc66fa2f91
am: 24791434c1

Change-Id: I78e4ee497bf73393bd696bc785bb8ea98c50d4ff