Merge "Fix jank when launching an activity from an occluding activity." into...

Merge "Fix jank when launching an activity from an occluding activity." into sc-dev am: f01d5502 am: 325f2dbb

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

Change-Id: Ifb63bbfc0d8fc284098a26f5d96db242f1d2aef8