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

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



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