[motoya-lmaru-fonts: 2/2] Updates from upstream git. https://review.source.android.com/#change, 22161