am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5

* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API