This reverts commit e3ff139062.
Reason for revert: PinnedStackTests#testEnterPictureInPictureDiscardSavedPositionOnFinish flaky
Change-Id: I067c94d536b1db94523ef3eec3d443e0dc4cb575
This reverts commit e3ff139062.
Reason for revert: PinnedStackTests#testEnterPictureInPictureDiscardSavedPositionOnFinish flaky
Change-Id: I067c94d536b1db94523ef3eec3d443e0dc4cb575