[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
am: d98908e7c7
skipped: 3503445e59
Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9
This commit is contained in: