Merge "Fix bottom split disappeared after unlock" into udc-dev am: 2940bd78b9

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

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