Merge "Fix ActivityEmbedding issues with REORDER_TO_FRONT" into tm-qpr-dev am: aebafa28

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



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