[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58 am: 970863ea62 am: 9707affaa8 am: 906080bd27 -s ours
am: 77d21995fc -s ours
am skip reason: subject contains skip directive

Change-Id: Iff8981642c8278a14827f946fc19efd8d6507e25