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: Ifdb49df9bddb903f4ebfbe89c9f1b53865d86029