Merge "Fix cold-lauch Activity Embeded apps flash black." into main am: b0f339a6

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



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