Merge "Make no-history activity be finished with different tasks" into sc-dev am: 5c62d1f9 am: 63639bbb

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

Change-Id: Ied517191844126dfd100570a44a49be1a437fb6b