[automerger skipped] Merge "Remove pinned tasks when starting locked task w/...

[automerger skipped] Merge "Remove pinned tasks when starting locked task w/ intent" into udc-qpr-dev am: b8ccc196 am: f7cf56ef -s ours

am skip reason: Merged-In Id7386eae96cd014bf41ab3c4184ba9f3a79bdf10 with SHA-1 6b6d5b9a is already in history

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



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