Merge "Fix "AlertDialogTestActivity has leaked window" issues" into nyc-support-25.2-dev
am: 9586ad34f5

Change-Id: Ia33b72150345f322beb97ff4935df87ebfa773d7