Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655  -s ours am: feca77b884  -s ours am: 4c2371db6b
am: 3d50fd1118  -s ours

Change-Id: I65b787f2752eb7b17ec175336a7f25ba23529781