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

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

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