[automerger skipped] locksettings: clean up logging of cached GK password...

[automerger skipped] locksettings: clean up logging of cached GK password expiration am: ad578e9b am: 0aa0901d -s ours

am skip reason: Merged-In I734c9115bd8ea0a44ed6c03754e87341848a00f5 with SHA-1 070e3d6c is already in history

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



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