[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work...

[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." am: cc1e7da8 am: 9571fc99 am: 207b28c7 -s ours am: eca2cee8 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f6545a79437dfcd3805480793c8eddef296cbdc