Merge "Revert "Ensure that only SysUI can override pending intent launch...

Merge "Revert "Ensure that only SysUI can override pending intent launch flags"" into qt-dev am: e6ffbc91 am: b34c8422 am: 62c12ffd

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



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