Merge "Fix UnlockedDeviceRequired with weak unlock methods" into main am: 05955e3839

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

Change-Id: I5d9f986b3792541f32c4c82d84a52a47115aa419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>