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

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



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