Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev