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

Change-Id: Ib48459fdc845a765e7db486a13ad9e6d58c8e5a5