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

Change-Id: I83b8b88439436c52543612b2b42ebd7952531525