[automerger skipped] Merge "Add active unlock chipbar flag" into tm-qpr-dev...

[automerger skipped] Merge "Add active unlock chipbar flag" into tm-qpr-dev am: 70b8153a am: 9085b0e6 -s ours

am skip reason: Merged-In I0dd53c4bc601ef2a91402092bf48745b678148be with SHA-1 ba156d81 is already in history

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



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