Move notification code out of ConnectivityService. am: f3ae2eeae4
am: 622b5fbbf5

Change-Id: Iecbc0416842fa8d8ed4efb2ca666793240f7a2cc