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

Change-Id: Iba24162bbcac29674b247a5c3f5ac7eb571cbea3