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

Merge "Merge "Do not use Paint.setFontVariationSettings as basis for variant Typefaces" into udc-dev am: ac3795b8 am: 6897a0be am: 07c9fb3c" into udc-qpr-dev-plus-aosp am: ea3417dc

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



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