Merge "Fix not clearing split pair record after auto-enter pip" into udc-dev...

Merge "Fix not clearing split pair record after auto-enter pip" into udc-dev am: f64b22f7 am: 9538c899

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



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