Merge "Active container should contain non-finishing activity" into sc-v2-dev am: d0f8b5e99d

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

Change-Id: I4373a6edecbd7258f3a57ead613299fe13f4c70f