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: ee4f18de

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



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