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

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

Change-Id: Id37713388c0c2245e708ca1ca81e78d288168dfd