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: d865e91f am: 5e9526b3 am: 6adc5b06

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



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