Merge "Only call canUserCallLockTask when the caller is a DPC" into udc-dev am: 6daf38c0 am: 7ef3484c

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



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