Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f

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

Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
tree: 04ed76f25389c98dfda0a527955282f45da9f278
  1. Tethering/