[automerger skipped] RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag am: 4cf74bdc20 -s ours

am skip reason: subject contains skip directive

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

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