Merge "Avoid NPE when trying to unlock user with wrong token handle" into main am: 5197fd2fd4 am: 63f5f3567c

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

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