RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag

Test: builds
Bug: 271148875
Change-Id: I1c062c58052291751cfa0abc9616736ce2f7bb72
2 files changed