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

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



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