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

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

Change-Id: I22892e3d695bd73cd56d3a986e51b4a3aa944c50