Merge "Add LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK to permitted lock task features when managing a financed device" into udc-dev am: 71d3ebc8 am: 01b85aa8

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



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