Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a
am: deac15fa83

Change-Id: I441a37682e11aa349301750c26545c5c0f1a274a