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: 346bf957

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



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