Merge "Revert "Ensure that only SysUI can override pending intent launch flags"" into qt-dev am: e6ffbc91fb am: b34c84221f am: 62c12ffd8e am: 29eb265f19 am: 61c27bb464 am: ffef4ed147 am: 65c1ef9feb am: f8dcd6ed29 am: 92ede9a4a2 am: 90a438c690 am: 02ac6e4583

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

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