Merge changes I0c45635b,I2201d0e4

* changes:
  Remove SystemMessageProto usage
  Replace PendingIntent/NotificationManager @hide APIs
tree: 73c9f493d2834863ca150bcb8043bdae761f43a0
  1. Tethering/