Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev am:...

Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev am: bac0f96f am: 7a40b19c

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



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