[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943
-s ours am: 2ef0e15b66
-s ours am: bea56da7d6
-s ours am: 8143665d70
-s ours
am: b3ad03f0ba
-s ours
Change-Id: I6f9b8de654a5381a16bc9c0df13eabc53852d300
This commit is contained in: