[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
am: 3be29d429b

Change-Id: Ia12a64ca1bd24f4070c6413abe1369009aa6c349