Merge "Fixing test that is breaking in some environments. Test: atest...

Merge "Fixing test that is breaking in some environments. Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_sameTask_fromProfile_success Bug: 252837119" am: cd2a8556 am: 373bd796

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



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