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

[automerger skipped] Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag" into tm-qpr-dev am: 30f403c2 am: 4b067b35 -s ours

am skip reason: subject contains skip directive

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



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