Merge "Don't intercept touches when the qs scrollview can't scroll" into...

Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev am: f27737a2 am: bf199e8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11955698

Change-Id: Icb3130018ef4c9fe4e7cc5db0bd7e4d228f11f53