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: 36b5974e am: 194acc9f

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



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