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

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



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