Merge "Allow extra keyguard logs to be enabled via adb" into sc-v2-dev am: c5e184b5

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

Change-Id: I5f57d9ff1f71dd2e78af5e3accf7f5df6f5ffd46