Merge "Remove pinned tasks when starting locked task w/ intent" into udc-qpr-dev am: b8ccc196

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



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