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

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

Change-Id: I7bbfcf02fd2e9e2d0914945814e9ef64cc3934ad