[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev

am: 38b9504a41  -s ours

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

Diff Content Not Available