Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am: b39e1f1a67

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

Change-Id: I67561e369585c4eb1176091c5589b6c4c6138a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josh Tsuji
2022-04-11 21:55:09 +00:00
committed by Automerger Merge Worker

Diff Content Not Available