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

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



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