Merge "Fix jank when launching an activity from an occluding activity." into sc-dev am: f01d5502fb am: d736828322

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15471456

Change-Id: I28fd71824af552ef44078cc7a75d80a8ba96d96e