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: I71384028efd4e96c8f2faba1177d36e205ac8e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>