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

Change-Id: I40ef0278707e238f6b3e825f0c661800a02c7afe