Merge "Do not dismiss QS toggling mobile data." into pi-dev
am: 3884c102a8

Change-Id: I24eac056c2761dbc4594e7e10e1275bb660651ce