am 690611d2: Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev

* commit '690611d2d92a800b56b0119c27b1cd661262e7b2':
  Keyguard: Register user specific broadcasts correctly