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

Change-Id: Iaaedc4cd8afb5bfc67914dbcaa3bdf11733ce22f