Merge "Do not use Paint.setFontVariationSettings as basis for variant...

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

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



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