Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
am: 4c9fa739ff

Change-Id: I300dda26365dab7052b74383a302676f3e99be55