[automerger skipped] RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag am:...

[automerger skipped] RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag am: 065f435e am: 7b206600 -s ours am: 3fbb79f7 -s ours

am skip reason: subject contains skip directive

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



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