tree 800112875f9ebe21e411111149b53d430d971411
parent d52de071e3fe695fea5f78318816b304d2b29de6
parent 498d367b2cfbd25c19a1c7c3b489e1113b240294
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557258052 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1557258052 +0000

[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c

Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479