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: d7368283 am: d27c1486

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

Change-Id: If17d328b36a35e2552dd74a1726ab32dbb22820a