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 am: 29eb265f am: 61c27bb4 am: ffef4ed1 am: 65c1ef9f

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



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