[automerger skipped] Don't pass HardwareAuthToken to unlockUser() in non-SP verifyCredential am: 665b5f9228 am: 753693671d am: 67701fa376 -s ours am: 6299d06f9b -s ours
am skip reason: Merged-In I3c176ba282f4c7901dd09fe3d66cfd380794fb48 with SHA-1 3654b097b1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021757
Change-Id: I0920fbe2cfcbe4cbf640b688410f97b1b44455d0
This commit is contained in: