Merge "Allow setting lock task features without setting packages" into udc-dev...

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

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



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