Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev am: 59f3781c am: c9647eaf am: 5182cad2

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



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