Merge "Enforce sysui-held permissions when getting main launch intent" into...

Merge "Enforce sysui-held permissions when getting main launch intent" into udc-dev am: 2d3f07bf am: 6f655086 am: c46a0bd4

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



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