[automerger skipped] Remove ACTIVE_UNLOCK chipbar flag am: 569ae829 -s ours...

[automerger skipped] Remove ACTIVE_UNLOCK chipbar flag am: 569ae829 -s ours am: f2feb361 -s ours

am skip reason: Merged-In I1c062c58052291751cfa0abc9616736ce2f7bb72 with SHA-1 065f435e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22103562



Change-Id: I37e163d698fac5a2ebf962d93ce0090ed2cf048f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>