Merge "Avoid app pinning requests if the Task is already locked" into sc-dev am: 92e535ff

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



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