[automerger skipped] Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar...

[automerger skipped] Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag" into udc-d1-dev am: 2692e40b -s ours

am skip reason: subject contains skip directive

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



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