Merge "Stop app pinning if lock task is requested from allowedlisted app" into...

Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am: 3544e25a

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



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