Merge "Updating style to size line height based on font size" into udc-dev am: 825e174b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23593116



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