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

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



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