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
Test: atest ActivityLifecycleTests with shell transitions enabled
Change-Id: I75b69b539d99305a764dc3e7bc61278eaa5817e2
Merged-In: I1138079b1ae05248cefa211e0597fd6723a8bbba