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

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

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