Merge "Maybe fix flaky testDetachCalledWhenDestroyFragment" into nyc-support-25.2-dev am: c24a66bc90
am: 0c43a1711c

Change-Id: Ic95d4050f4225fdfb36f7f4e7bfad60bc793d591