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 am: 96986f64

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



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