Merge "Only call canUserCallLockTask when the caller is a DPC" into udc-dev am: 6daf38c0 am: e8f897e0 am: 884fb85c am: f38ed676

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



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