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

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

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