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

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



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