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

Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c621 am: 41bf4e7c am: 7adf19f3 am: 99f48340 am: 2dc64f37 am: e8f89077 am: 87b44f8b am: e288ef9d am: 0207409f am: 1874df51 am: d2c6d0c5

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



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