Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996



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