[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 skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history

Change-Id: I681088ce1e30c91e2d9b9a1730acd2f7a6ca2185