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

Change-Id: I57655252c63841cf5799d496d64d964101552cf2