[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739ff am: 66785eeba5 -s ours am: 97d3ab297a -s ours
am: eaafe5e711 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e554bb5fde073f966f921b1a48065b83886c6e1