Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2

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

Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633