[automerger skipped] Merge "Fixing test that is breaking in some environments....

[automerger skipped] 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 am: 4db1d7ea -s ours

am skip reason: Merged-In Ie0ca41247b80f927ef1377866d1a2d2d2deb5333 with SHA-1 9ff47bcb is already in history

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



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