Merge "[TP] Vscroll should not intercept when hscroll" into tm-qpr-dev am:...

Merge "[TP] Vscroll should not intercept when hscroll" into tm-qpr-dev am: 993d399f am: 62b9696e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21413265



Change-Id: I73e8d5ce37372d6344f4802162c37803e14bfede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>