Merge "Merge "QS: Fix QS touch breaking" into nyc-dev am: 8fd8a4fde8 am: 45ddf4891f" into nyc-mr1-dev-plus-aosp
am: 71bd46c92b
* commit '71bd46c92b0dbd0228289bd2aec62a6f139df578':
Change-Id: I6cd43fa46796b351590b3b1a5f9cb545e0d81a33
This commit is contained in: