[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).
am: cd6c636800 -s ours
am skip reason: subject contains skip directive

Change-Id: I505c495256607b7379798bd0c2d926dacc48ca66