am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
automerge: 562e87b

* commit '562e87bdd5eb58a97cce2224c36443f8915fa7d8':
  Run isKeyguardSecure under system privileges