Merge "Do not use Paint.setFontVariationSettings as basis for variant Typefaces" into udc-dev am: ac3795b8aa

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

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