Merge "Do not use Paint.setFontVariationSettings as basis for variant Typefaces" into udc-dev am: ac3795b8 am: 6897a0be am: 0c763652 am: f058630f

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



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