Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev am: 59f3781c am: 5a125890 am: c881d221

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



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