Merge "Split up KeyguardBottomArea" into udc-qpr-dev am: c45ff2e900

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

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