[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
am: f2335b6567
-s ours
Change-Id: Ia1a0f9d0a728b603ec4cde705f4e4532899aba50
This commit is contained in: