Merge changes I0c45635b,I2201d0e4

* changes:
  Remove SystemMessageProto usage
  Replace PendingIntent/NotificationManager @hide APIs