tree 6f58e2bc47751197d720cee2f025ca70c0cdf922
parent daa97df4dcfa56d291712dbf7f44ed62f6e9869b
parent b4bb7d172004065fbf4d0a0c5ca332c60ea86f5c
author Jonathan Scott <scottjonathan@google.com> 1614795844 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614795844 +0000

Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7 am: b4bb7d1720

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56e12a0ec1c6ea6930690b0c0b387ec5553a79c4