[automerger] DO NOT MERGE Disable changing lock when device is not...
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaf am: c056ac30 am: 782fc16d am: aaa67659
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554