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