Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996 Change-Id: I1ae494fdf01a9aa5e7a0f5a84ece9f1136f558a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: