Fix "AlertDialogTestActivity has leaked window" issues am: 0856efc954
am: e2fcfd1fee

Change-Id: I6e2ea13ccd18982ec62ed9e84899c62d13687f4f