[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c636800 -s ours am: 84778db6b6 -s ours am: ffc54fc8b9
am: 1eeffeb98c

Change-Id: I79112461e122b72ff05fde5d130180a289ee9124