Merge "Prevent activity being destroyed immediately if embedded" into...

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

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

Change-Id: I5544d58402b8c44536a67a8077bd33e60573ff5a