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

Change-Id: I6e3290891f322c1caca3ff70a3aa39dd140d6256