Merge "Fix digit translation when digit width changes Update font variation...

Merge "Fix digit translation when digit width changes Update font variation settings in rebase" into udc-dev am: d773fcca am: 1e9e0426

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



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