Merge "Add LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK to permitted lock...

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

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



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