Merge "Move active unlock chipbar flag to a ResourceFlag" into tm-qpr-dev am: e22e3694

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



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