Merge "Add bottom offset to the intial padding rather than accumulating it." into rvc-qpr-dev am: f3c9998a48 am: 43e48bab7d

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

Change-Id: Ib8e8cf61878f57e838c39e40fa0f6928a36b9a14