Merge "Enable active unlock chipbar UI by default" into tm-qpr-dev am: 437300c7

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



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