Merge "Fixing com.android.launcher3.ui.widget.TaplAddWidgetTest#testDragIcon" into main