Merge "Do not inset scrollBounds by padding unless clipToPadding==true" into sc-dev am: eaefe1464f

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

Change-Id: Ifcd7a4a76df81f5c9025005a8301ac91a347d913