Merge "Consolidate adjacent launch while having a background split pair" into...

Merge "Consolidate adjacent launch while having a background split pair" into udc-dev am: 71884552 am: 83054620

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



Change-Id: I80df6675e1c2bb1a0da5fa96e859d658854ea402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>