Merge "Not bypassing when the user is expanding quick settings" into qt-r1-dev
am: cd29fce36d

Change-Id: I91e9a263edddc74dd172031f1ba971bfe48d0cc5