Merge "Make no-history activity be finished with different tasks" into sc-dev am: 5c62d1f9 am: 63f34857 am: 668eaa9e

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

Change-Id: I0c8ff86fd58696ac22c67797a5a006bfbb8b41da