[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

Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072