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

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

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