Merge "Consolidate occlusion events into KeyguardStateController" into tm-dev am: 68d2fdfde6 am: fe824ad173
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391821 Change-Id: Ideda71f8769528fd6dd54f4215631d5b54aa5bb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: