Fix NavigationBarColorTest

Manually partially revert I4910c2a06cc67b0470477b245fc1de54b75f10f9 so
that we don't use a window that's animating away as control target.

Fix: 161659326
Bug: 153145997
Test: atest NavigationBarColorTest#testSetNavigationBarColor

Bug: 167499521
Fixed: 167499521
Exempt-From-Owner-Approval:‌ ‌Cherry-pick of downstream change
Merged-In: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
Change-Id: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
(cherry picked from commit 588fa46c)