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

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



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