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

Change-Id: I8fec85e4a671528520d3131c357ef0dc21e3d62b