Merge "Fix test failures under com.android.settings.dashboard" into main