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

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



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