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

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

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