[automerger skipped] Merge "Remove ACTIVE_UNLOCK chipbar flag" into udc-dev...

[automerger skipped] Merge "Remove ACTIVE_UNLOCK chipbar flag" into udc-dev am: e801ab56 -s ours am: 815d00e0 -s ours

am skip reason: Merged-In I1c062c58052291751cfa0abc9616736ce2f7bb72 with SHA-1 065f435e is already in history

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



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