Merge "Merge "KeyguardBottomAreaView new impl. - data layer" into tm-qpr-dev...

Merge "Merge "KeyguardBottomAreaView new impl. - data layer" into tm-qpr-dev am: d3a180b0" into tm-qpr-dev-plus-aosp am: c2dc0e2b

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



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