Merge "Only allow system or sysui to set launch activity type" into sc-dev am: 8f5d0a87

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

Change-Id: I127f01157db21ea5996c51e17e969e43ffd4eb18