Merge "Report correct userId in onUserMayRequestUnlock." into udc-dev am:...

Merge "Report correct userId in onUserMayRequestUnlock." into udc-dev am: c0553faf am: a90f5361 am: 6b0be15d

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



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