Merge "Do not evict starting task when startShortcut" into tm-qpr-dev am: 8a1fa447

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



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