Merge "Use Correct feature flag for isLockTaskPermitted" into udc-dev am: cc3a74b4

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



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