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

Merge "[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: 54e9da69 -s ours
am: 1232e284 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a0ac474765d71702c3098593d00ce8a42a26f88