Merge "Consolidate adjacent launch while having a background split pair" into udc-dev am: 71884552 am: 83054620 am: 71704ab4 am: bd211b53

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



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