Merge "Avoid app pinning requests if the Task is already locked" into sc-dev...

Merge "Avoid app pinning requests if the Task is already locked" into sc-dev am: 92e535ff am: 8eb41edd am: 9d25b568 am: 0a97c13c

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



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