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: f298bdc9 am: 2439536c

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

Change-Id: Ieea28e7f7cadb6bb52bb3a86d1a58596362d7a9e