Merge "[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: 7387317e85 -s ours am: c5335d502d -s ours
am: 03a7eb3372 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bc81736c77bd1db1b2fd644732ddf64923ca7c6