am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API"...
am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae50
* commit 'cf047b5d':
Update KeyguardManager.isDeviceLocked API