Merge "Fixes scroll bar issues." into tm-dev am: 6bb32788 am: 6c5ad138 am:...

Merge "Fixes scroll bar issues." into tm-dev am: 6bb32788 am: 6c5ad138 am: ded505e5 am: 135055e7

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



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