Merge "Verify pending intent flags" am: f623c1e2c2 am: d583f34df1 am: 8d2626f55a am: 1a306394c9 am: 2f6350d886

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

Change-Id: I154ad1f3e02b9f94dad208f1c5c5dc667ef9114d