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

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

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



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