Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev am: 59f3781c am: 5a125890 am: 96a9c0ba am: 7894a3df

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



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