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

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

Change-Id: I2f2e88e8d0bb4809aedff852cdedf8f86200ddcb