Merge "Consolidate adjacent launch while having a background split pair" into udc-dev am: 71884552 am: d865e91f am: 4780689f am: 46f2ac96

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



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