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 am: 71704ab4

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



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