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

Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eaf am: b5ceeb0c am: 362cd80b am: 78d25d2b

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



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