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

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

Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628
tree: c3d856b9bd3bca2d7fda80564e0989f884ff6625
  1. Tethering/