[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
am: 3672a1fe7f
am: cff5200146
am: 0f0147213e
-s ours
Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
This commit is contained in: