Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451947 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2bbedca9d531a32a4d25adaea7f5ab5134cab74
This commit is contained in: