[automerger skipped] Merge "DO NOT MERGE Use KeyguardStateController for #isShowing" into tm-qpr-dev am: 04821a8990 am: f48e967738 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20024905 Change-Id: Ib319c4a779072e0d1d5bd6c8efde3775538ffcf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: