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: 403490f2 am: 4e1f309a

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



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