Merge "Fix CtsWindowManagerDeviceActivity:UnsupportedErrorDialogTests for the visible background user" into main