Merge "Fix issue with android.widget.cts.TextViewTest#testGetFadingEdgeStrength are failing on ro.sf.lcd_density=120" into lmp-dev