[automerger skipped] Merge "KeyguardBottomAreaView: cleanup." into tm-qpr-dev am: bd23b31777 -s ours
am skip reason: Merged-In I7a76bdf84ede1c67e5901487d5572a9c1704fc68 with SHA-1 f4fd650b52 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868699
Change-Id: I0aac89a566530bc761bc5886a40461ddfab1a6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: