Fix a bad merge

A previous merge went in that incorrectly removed this part of
another change (I993dad973ea4b273f77df5671a93cbfd9b21e808). This CL
is undoing that.

Bug: 183993924
Change-Id: I107e80dd733fb93d829c04a8076d9a1690547fd0
Test: atest ActivityLifecycleTests with shell transitions enabled
1 file changed