[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: 1dc887fd -s ours
am skip reason: subject contains skip directive

Change-Id: I5a09db992d1d9ef5bc335827ac94f636f02f166f