Merge "Replace the fixed size values with the new dimen resources." into...

Merge "Replace the fixed size values with the new dimen resources." into sc-dev am: 0edd421d am: 6f308205

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

Change-Id: Ib6b9d3dfb84134d3ba7c996bccfe79f753878c93