Merge "Update LogBuffer pattern in some keyguard code" into tm-qpr-dev am: b6fe548430 am: a776a5ea14

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

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