Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am:...

Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b9624619 am: 88cbac1a am: 518c3ce3

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

Change-Id: Ia890b7dec707d748c000d61cbee8e6265e1e86ba