Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2 am: 71eee20732 am: 429126464c am: d7638aecc2 am: b4226fe3e5

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

Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628