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: 53c42252 am: 8150352d am: 7d997266

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



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