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

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

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