Merge "Prevent activity being destroyed immediately if embedded" into sc-v2-dev am: eec6c21e

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

Change-Id: Ia84d2e44c707eab2975f50344a5e5f6f43e88213