[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours am: 8c84949c84 -s ours

am: 690a4a199c  -s ours

Change-Id: Ib0fbb7fcaa2f0fd26687213d511dfbd185a0eac5
This commit is contained in:
Doris Ling
2018-08-09 13:24:51 -07:00
committed by android-build-merger

Diff Content Not Available