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: 1fac50a2 am: 619c5732

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



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