[automerger skipped] DO NOT MERGE Disable changing lock when device is not...
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad am: 3672a1fe
am: cff52001
Change-Id: I44df485b49098b69371d1248067e51559dcd4964