Partially revert ag/27263995

This CL is a partial revert of ag/27263995 because that CL caused a
flicker when expanding a notification from the locked shade. See
b/339801674 for details.

Bug: 339801674
Bug: 330672236
Test: TransitionAnimatorTest
Test: DialogTransitionAnimatorTest
Test: ActivityTransitionAnimatorTest
Flag: EXEMPT revert of regression b/339801674
Change-Id: Ib429af42cc4cf97f278505b2854fcd7701c3ae01