Merge "Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount"