[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am: 3be29d429b am: c0c0827df5 -s ours am: b2c9f618d4 -s ours
am: 4f4d45704d -s ours
am skip reason: subject contains skip directive

Change-Id: I38a1390da4cb8f28197660e07c8357a6478bd014