Merge "Update to accommodate variable fonts. am: 43206fc269 am: 16eaf55bff am: e5105bb1dd" into rvc-qpr-dev-plus-aosp