Merge "Verify pending intent flags" am: f623c1e2c2 am: d583f34df1 am: 8d2626f55a

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

Change-Id: I885046eb25c6dafbcb4284fd94bff0052f7bdd09