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

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

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