Merge "Prevent repeatedly resuming/pausing activities in split" into sc-v2-dev am: c983f32c

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

Change-Id: Ia7aca0c35715ba26eca3c4962a0bf02027193363