[automerger skipped] Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag" into tm-qpr-dev am: 30f403c264 am: 4b067b3592 -s ours am: c44ba99063 -s ours am: ec50b134cd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21651384 Change-Id: I7a076fa15fd3dab7029aeae13e008b8054b0d653 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: