Merge changes from topic "am-63843d5c32d447738964aada8df755cc" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af
  [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: acb731f978