Merge "Allow setting lock task features without setting packages" into udc-dev am: f0a411d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761399



Change-Id: Ia15bb42a5bf67be22c8e2fb7ca8c1ffeaaf59653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>