Merge "Use the current padding instead of the default one during layout." into sc-dev am: f45161efa1

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

Change-Id: I392d1d1e91872cbe9024bb6b0d375e5835442218