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