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

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

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