Merge "Update scaled padding for all devices" into tm-dev am: 56e26a9e am:...

Merge "Update scaled padding for all devices" into tm-dev am: 56e26a9e am: aefa0afa am: 7bd340d9

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



Change-Id: Id00572baba95320e9873235e597600c89f9f6e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>