[automerger skipped] Remove ACTIVE_UNLOCK chipbar flag am: 569ae829ac -s ours
am skip reason: Merged-In I1c062c58052291751cfa0abc9616736ce2f7bb72 with SHA-1 065f435e27 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22103562
Change-Id: I80e2b1aa8f065a0e10402c2d3f37d1c8702f06e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: