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 am: 401df3d3

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



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