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: 718f0789

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



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