tree d20d055f20c7f27bb633c44cc4f4174053c05213
parent 96f4f9e2e901a43f697e149f885f8eac4460eb73
parent 9707affaa8e543e9c00365093966ebe4a3af2eb1
author Jonathan Scott <scottjonathan@google.com> 1557365938 -0700
committer android-build-merger <android-build-merger@google.com> 1557365938 -0700

[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

Change-Id: Iba3263f17bb98cbad6239b04d6f3d7667312118a