Merge "Destroy the last embedded activity immediately" into tm-dev am:...

Merge "Destroy the last embedded activity immediately" into tm-dev am: 5f99fcc0 am: 7efeba7d am: b68a1a31

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



Change-Id: I04c7e1d2f536f1beaf03c33d73fb446afd09254c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>