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

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

Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537