[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/...

[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am: 3be29d42 am: c0c0827d -s ours am: b2c9f618 -s ours am: 4f4d4570 -s ours am: 7387317e -s ours am: 05c7303e -s ours
am: 3f73d665 -s ours
am skip reason: subject contains skip directive

Change-Id: I49434ac033f67629f28aa0b39413de58659bb416