Merge "Merge "Move bottom padding from ScrollView to child" into tm-dev am:...

Merge "Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eaf am: 4310d341" into tm-d1-dev-plus-aosp am: be1ef9c7

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



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