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