[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d am: 4938d3e5 am: 498d367b am: d6f4a3f2 skipped: ad38008f am: 970863ea am: 9707affa
am: 906080bd -s ours
am skip reason: subject contains skip directive

Change-Id: I4faa3f6284b8708d2ece0f96db8ec498bc841299