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