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