Merge "Use the current padding instead of the default one during layout." into...

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

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

Change-Id: Ic501bf8a6373994ee3f3592c785aaab454df6b79