Merge "Fix some sizes that weren't changing for font scale / display size`"...

Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev am: 9f97f893

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

Change-Id: I5168e30405d1e584219c02ae00de16d3ecee1a14