Merge "Feature flag for which impl. of KeyguardBottomArea" into tm-qpr-dev am: 60a06a5b

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



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