[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739 am: 66785eeb -s ours am: 97d3ab29 -s ours am: eaafe5e7 -s ours am: 2288a743 -s ours
am: 7c22426a -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c6368 is in history

Change-Id: I8d45de924e89eafcc2a2cc0e48525e8a1c7e708c