Merge "Don't reset the keyguard on occlusion if it's going away." into tm-d1-dev am: f50462e680 am: 801407daf0

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

Change-Id: I262e61356d5afd643021261182794e8e0f5dbdc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-04 12:28:10 +00:00
committed by Automerger Merge Worker

Diff Content Not Available