[automerger skipped] Merge "Add ViewController for KeyguardBottomAreaView."...

[automerger skipped] Merge "Add ViewController for KeyguardBottomAreaView." into tm-qpr-dev am: 5086c853 am: 338f54bb -s ours

am skip reason: Merged-In I3945214b2670ddd6a9f48736407ebdb89203c017 with SHA-1 199b699c is already in history

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



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