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: 3162f432 am: 4a053246 am: b3f4c092

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

Change-Id: I46f1161fac216fd8d969a267f63e95ce821ad66b