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: ef92d2e8

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



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