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: af15f9a5 am: 4b7d8c10

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



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