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: I50d70a5ad9bd59419273259441bdca7619e3be41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>