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

Change-Id: I2ef6009364bd1420c915df003e2ff5c3857ef3e7