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

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

Change-Id: I745d8da55192316df119d5e3501a1662d9a2ac6d