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