Merge "Fix bug #5382767 android.view.cts.ViewTest#testInitializeScrollbarsAndFadingEdge fails on IRK89 mysid-userdebug"