Merge "Fix not clearing split pair record after auto-enter pip" into udc-dev am: f64b22f7 am: af15f9a5 am: f298996b am: 33ac5162

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



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