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: a9c9804d

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



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