Merge "Use the current padding instead of the default one during layout." into sc-dev am: f45161ef am: 142aef1b am: fc24e6fe

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

Change-Id: I16cab257f4c7d059cee4f3b7d42c2e084f733a83