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: fa32bfba am: 13c40448

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



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